merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 16 Jul 2012 22:25:00 +0000 (07:25 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 16 Jul 2012 22:25:00 +0000 (07:25 +0900)
commit3cc95f9ecf4b8a14d783edfa2e9d2f7fbc83a77b
tree565ff99ba3e5cdb7f0696c9661cd21bd4d5b17f0
parentcfe34408bda0e23289fed1ce0e768f8096b53f41
parent43c99273b21b073b8b155eb05ea26edd654e55df
merge trunk